[llvm-exegesis] Error instead of aborting on verification failure #137581
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This patch makes llvm-exegesis emit an error when the machine function fails in MachineVerification rather than aborting. This allows downstream users (particularly https://github.com/google/gematria) to handle these errors rather than having the entire process crash. This essentially be NFC from the user perspective minus the addition of the new error message.
Member
|
@llvm/pr-subscribers-tools-llvm-exegesis Author: Aiden Grossman (boomanaiden154) ChangesThis patch makes llvm-exegesis emit an error when the machine function fails in MachineVerification rather than aborting. This allows downstream users (particularly https://github.com/google/gematria) to handle these errors rather than having the entire process crash. This essentially be NFC from the user perspective minus the addition of the new error message. Full diff: https://github.com/llvm/llvm-project/pull/137581.diff 1 Files Affected:
diff --git a/llvm/tools/llvm-exegesis/lib/Assembler.cpp b/llvm/tools/llvm-exegesis/lib/Assembler.cpp
index f638478e0c51d..67f3d75a5e879 100644
--- a/llvm/tools/llvm-exegesis/lib/Assembler.cpp
+++ b/llvm/tools/llvm-exegesis/lib/Assembler.cpp
@@ -29,6 +29,7 @@
#include "llvm/MC/MCInstrInfo.h"
#include "llvm/Object/SymbolSize.h"
#include "llvm/Support/Alignment.h"
+#include "llvm/Support/Error.h"
#include "llvm/Support/MemoryBuffer.h"
#include "llvm/Support/raw_ostream.h"
@@ -323,10 +324,8 @@ Error assembleToStream(const ExegesisTarget &ET,
TPC->printAndVerify("After ExegesisTarget::addTargetSpecificPasses");
// Adding the following passes:
// - postrapseudos: expands pseudo return instructions used on some targets.
- // - machineverifier: checks that the MachineFunction is well formed.
// - prologepilog: saves and restore callee saved registers.
- for (const char *PassName :
- {"postrapseudos", "machineverifier", "prologepilog"})
+ for (const char *PassName : {"postrapseudos", "prologepilog"})
if (addPass(PM, PassName, *TPC))
return make_error<Failure>("Unable to add a mandatory pass");
TPC->setInitialized();
@@ -337,6 +336,10 @@ Error assembleToStream(const ExegesisTarget &ET,
return make_error<Failure>("Cannot add AsmPrinter passes");
PM.run(*Module); // Run all the passes
+ bool MFWellFormed =
+ MF.verify(nullptr, "llvm-exegesis Assembly", &outs(), false);
+ if (!MFWellFormed)
+ return make_error<Failure>("The machine function failed verification.");
return Error::success();
}
|
mshockwave
reviewed
Apr 28, 2025
Contributor
Author
|
@mshockwave Bump on this when you get a chance. Thanks! |
mshockwave
approved these changes
May 20, 2025
Member
mshockwave
left a comment
mshockwave
left a comment
There was a problem hiding this comment.
Sorry this slipped through my radar. LGTM.
boomanaiden154
added a commit
to boomanaiden154/gematria
that referenced
this pull request
May 20, 2025
This includes llvm/llvm-project#137581 which makes it a bit nicer to deal with verification failures, some of which come from inline assembly and would be difficult to fix within LLVM.
boomanaiden154
added a commit
to google/gematria
that referenced
this pull request
May 21, 2025
This includes llvm/llvm-project#137581 which makes it a bit nicer to deal with verification failures, some of which come from inline assembly and would be difficult to fix within LLVM.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This patch makes llvm-exegesis emit an error when the machine function fails in MachineVerification rather than aborting. This allows downstream users (particularly https://github.com/google/gematria) to handle these errors rather than having the entire process crash. This essentially be NFC from the user perspective minus the addition of the new error message.